system-crates

Gbp-Pq: Name system-crates.diff

diff --git a/Makefile.fetch b/Makefile.fetch
index 64c15b67b642f5e68b7b33edc9d3bb427718a0f1..e88ec4928fff74b618f57353277d5b2ed47e06fd 100644 (file)
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -256,8 +256,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
                $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
        ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
        -@mkdir -p $(TARFILE_LOCATION)/cargo
+       $(if $(filter TRUE,$(SYSTEM_YRS)), \
        $(if $(call fetch_Optional,YRS,1),\
-               CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml)
+               CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml) \
+       )
        @mkdir -p $(dir $@) && touch $@
        @mkdir -p $(dir $@)/Executable
 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 17543065dcbbc60e5debbecbf00edd2b0429f58c..8b5863ebf9ed439bac258266f1b49464c5d29c39 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4547,6 +4547,7 @@ endif
 
 ifneq ($(WITH_YRS),)
 
+ifeq ($(SYSTEM_YRS),)
 define gb_LinkTarget__use_yrs
 $(call gb_LinkTarget_use_external_project,$(1),y-crdt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4569,6 +4570,16 @@ endef
 
 else
 
+define gb_LinkTarget__use_yrs
+$(call gb_LinkTarget_set_include,$(1),\
+       $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(SRC_ROOT)/debian/cargo_registry/yffi/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/libyrs.a)
+endef
+endif
+
+else
+
 gb_LinkTarget__use_yrs :=
 
 endif

diff --git a/config_host.mk.in b/config_host.mk.in
index 22bca59f7d92b43aa7de0aa0f04634d5b8631470..b15034f57794b50443d47a6b6c2b004bc396e3ca 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -748,6 +748,7 @@ SYSTEM_WPD=@SYSTEM_WPD@
 SYSTEM_WPG=@SYSTEM_WPG@
 SYSTEM_WPS=@SYSTEM_WPS@
 SYSTEM_XMLSEC=@SYSTEM_XMLSEC@
+SYSTEM_YRS=@SYSTEM_YRS@
 SYSTEM_ZLIB=@SYSTEM_ZLIB@
 SYSTEM_ZSTD=@SYSTEM_ZSTD@
 SYSTEM_ZMF=@SYSTEM_ZMF@

diff --git a/configure.ac b/configure.ac
index 4d039c1c49b1274b56426e70e2ee60d7d28665e3..026f8c7af8ffd63deee3842dbdd72a014bc1b29c 100644 (file)
Binary files a/configure.ac and b/configure.ac differ